Auto merge of #2115 - alexcrichton:nondeterminism, r=brson
authorbors <bors@rust-lang.org>
Thu, 5 Nov 2015 17:09:37 +0000 (17:09 +0000)
committerbors <bors@rust-lang.org>
Thu, 5 Nov 2015 17:09:37 +0000 (17:09 +0000)
These were all exhibiting some nondeterminism which meant that they were failing
tests on CI.


Trivial merge